diff --git a/db845c.mk b/db845c.mk
index 3d44eb3..721a9ad 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -1,3 +1,8 @@
+ifndef TARGET_KERNEL_USE
+TARGET_KERNEL_USE := mainline
+endif
+DB845C_KERNEL_DIR := device/linaro/dragonboard-kernel/android-$(TARGET_KERNEL_USE)
+
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/linaro/dragonboard/db845c/device.mk)
@@ -9,10 +14,12 @@
 PRODUCT_DEVICE := db845c
 PRODUCT_BRAND := Android
 
-ifneq ($(DB845C_USES_GKI),)
-# The path here need to be finalized (ideally in the dragonboard-kernel dir)
-DB845C_MOD_DIR := device/linaro/dragonboard/db845c-mods/
-DB845C_MODS := $(wildcard $(DB845C_MOD_DIR)/*.ko)
+ifndef DB845C_USES_GKI
+DB845C_USES_GKI := true
+endif
+
+ifeq ($(DB845C_USES_GKI), true)
+DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko)
 ifneq ($(DB845C_MODS),)
   BOARD_VENDOR_KERNEL_MODULES += $(DB845C_MODS)
   BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(DB845C_MODS)